Revert d2e74c6..c44bbc2

This rolls back to commit d2e74c6cf730584c5ef5634dbaf39f867bf69599.