This reverts commit 4f873376.

Reverting the line in 4f873376 causing issues until it can be
properly investigated.