Revert c3000ed..356edb5

This rolls back to commit c3000ed9f6e608bb6fac651f87ef74a1ed6f967d.