Revert d697b69..2c4fa88

This rolls back to commit d697b6962862120075991674abb2cb7a0bdaefed.