Revert last commit; I have no idea what I'm doing.