Revert fd8c1b1..0c2eb55

This rolls back to commit fd8c1b1578d51ba6d6e71cf1312266a79a9ff367.