I failed to notice that the changes didn't apply cleanly. With this commit everything should be a-okay again.
mentioned in commit 793ad44c