Revert "Possible fix"

This reverts commit 4f6aa98d5b3c25d6230330c97eb45873609fffb1.