Backout 2b3c073ed02163fe48cef17e5ded24dfebdbb008 the addition of a couple more constants as we decided not to have them