Revert "Merge branch 'constants'"

This reverts commit 172d531db38f42f726e53993271bdf3f3332e48b, reversing
changes made to d4313e929af017b14e069d0c1e00fed83cf6ff73.
Merge branch 'enums' into master