Revert d7f51e4..a346745

This rolls back to commit d7f51e4712cc27a9b61445cdd6561e556166796b.