Revert 9b143f9..9f60735

This rolls back to commit 9b143f9da2d9b0a129bf3ecfdcefbee6ac50624a.