Revert previous shenanigans