Revert c2fa6a6..cdbb895

This rolls back to commit c2fa6a6cf487f7543a2d98fa53ffcfcfb4c0d44b.