Revert c919c76..55a86dc

This rolls back to commit c919c76e514c8537ce214a43032132b1e7ae1547.