Revert cf9823b..a391959

This rolls back to commit cf9823bdba965d1f19bdf3668dcf9bb758f6bfcb.
Post meeting push
grr