Revert c9f3097..6a7aacf

This rolls back to commit c9f30972eaecffa95f0d788adcbb7da523d1cdd6.