Revert 9cd4ebf..d67d8ca

This rolls back to commit 9cd4ebff9b46584505fcb8bbb7b331efbbe83fc9.