Revert c53b342..5fc3655

This rolls back to commit c53b342c1e11ef8c2dbc11b4b7bc5cc6681b639d.
.