Revert c4ccd23..3ed9a23

This rolls back to commit c4ccd233b4e922987b7d6d52ca96bc22c4483010.