Revert a64236b..a82a82f

This rolls back to commit a64236b0be6d0c76f7bff7796f12b164d8dbb8d3.