Revert c286866..b3dce4c

This rolls back to commit c28686691c1312096de257f6fc6020d3570e5efa.