Revert "Try this?"

This reverts commit 8cbe0120dda7fd3c2c638a51766842b8ce13c118.
Trying some hacks