Revert c27d833..016b494

This rolls back to commit c27d8332adfd6549f609cb2a2d8fe09778e0e53b.