Back out accidentally committed WIP hunk breaking tests