Revert bdfd6cb..bb3dd17

This rolls back to commit bdfd6cb59dc3b19d68811088dfaa19e033c89b40.