Revert 678478a..65d9ee0

This rolls back to commit 678478a0ac166fd6b6ebac78e4bc8b82f17a601a.