Undo REQUIRE change, avoid merge conflict