Revert "Merge pull request #19 from Grizzard/v-monday-branch"

This reverts commit 0c19cbb0dcbaa10081fa8b3b53308f3b0b0fa933, reversing
changes made to 4fe4b9b5e3816ef81ea2b80a03bf27167d3c51c2.