Revert a961f5a..1637b1c

This rolls back to commit a961f5acff52d5ec8a9b83e434ec8e0ea93a69d9.