Revert f38e8c8..7a10953

This rolls back to commit f38e8c87be35f3eab1d9b923479866c993449b6b.
freeze midway after revert