Reverting changes as they didn't fix the issue

This reverts commit a0c59b59b77d6591e9bd883692810c4f747f1cb8.