Revert "Merge branch 'dev/change-consumer-build-properties'"
Revert "Merge branch 'dev/change-consumer-build-properties'"

This reverts commit cc036d5d44429cf53b69529504649284423d86fd, reversing
changes made to 1bbd38976c7e8cf9503dd41e974712fb55ebf952.

MatthewTamlin/Spyglass