Revert a97ac48..f73f80e

This rolls back to commit a97ac4860644127fca8884f148f355ea7d8a9262.