Revert b82fb3f..fd4caad

This rolls back to commit b82fb3fbb20dd768c54ecc33b7d51f1433ecf361.