Revert b4a2e9d..c6677a7

This rolls back to commit b4a2e9da03f7d44efda23815108f92dbc14b807b.