Revert c752d2b..fec02fa

This rolls back to commit c752d2bcccee85f97d3ec71bbdf3ce02cc2aa1d7.