Revert 5c10694..768adc0

This rolls back to commit 5c10694098ecf5f8f6bd285d939ad1a970776183.