Revert "Merge branch 'caleb/master' into develop"

This reverts commit 5558daed11a09f98b2d2cc013e3569921909abbd, reversing
changes made to 3a3dd0134b0a9675c7baa48f7ba30c6a92e85195.