Actually do what the other commit meant to do and revert some changes