Fine with me, but should be separate commit.