Revert c446532..5b2e416

This rolls back to commit c44653297a6694c3bbb2d07ed75347386e2199e9.