Revert "jwhite80DemoBranch"

This reverts commit ab6dcc60d487367cd51dc955f2812d059e78cb95.