Revert back commit

The intention of this commit is to serve as a landmark for a possible
revert. Everything after this is a result of coding after the Monday's
meeting with Barrett and Pourang.