Reverting some changes I don't remember making, and which are now incorrect anyway