Revert "Temp commit to get tests passing for demo deployment.  MUST REVERT LATER."

This reverts commit f57ce627e4fc287d90dc925e8ea612271a45c156.
Tests failing, but the logic is sound.