Revert afd18f8..336cfc4

This rolls back to commit afd18f8f4f4ff65564144cecbd422155849b35c7.
bad branch
deploy rb4