Revert cb6737b..ec767e1

This rolls back to commit cb6737b5c7b35efc48c18951fc0f8fe862e9e186.