Revert 800dbe9..1709d8c

This rolls back to commit 800dbe92dd5b9a15cc3a5b869422e72aeeec1ecd.