Revert a58af31..1b5b930

This rolls back to commit a58af31c16257c91d8d6da3f811811ccde827610.