This reverts commit 4f87337646. Reverting the line in 4f87337646 causing issues until it can be properly investigated.
4f87337646