And the bug is discovered. After this commit history is wacky.