Revert a1eca52..95e9e71

This rolls back to commit a1eca52a7b3586e8fcd91003c3c4e97961e1100b.