Revert scary workaround