Merge branch 'Gabe-testing' into gabe-2
Revert 7e31e5a..01dec66

This rolls back to commit 7e31e5a48a363682658b22aabf1e35f7abca9ae7.
Merge branch 'gabe-2'
Merge branch 'master' into Gabe-testing