Revert c76103e..131faa1

This rolls back to commit c76103e9684cc042ff1fde7b760bdf0cce801386.