Revert d4d7fab..89dc665

This rolls back to commit d4d7fabe5fc51d120eec746ad04ce903a2bf5fa9.
Working Copy. Before Q2 elaboration.