Revert d2cbc1a..50d1b94

This rolls back to commit d2cbc1a438bcd40418abc437da4873084cb30f86.