Fix merge conflict created by... (ahem) previous commit.