Manually reverted to 29 May commit

Because I'm an idiot and can't figure out this branching thing.