Use VERSION_BUILD where possible. Revert a change from previous commit.