This reverts commit 4a60fc58. This was not an appropriate fix to whatever was needing to be addressed.