Revert ccb6eea..3b6bc02

This rolls back to commit ccb6eeaba4fd9d1de6618847e73e5c8781ba01ac.