Rollback 23 commits that weren't supposed to end up in master.