Revert 6a035e7..97a7427

This rolls back to commit 6a035e77ff0c16d704d371f010375cda5eff2727.
resubmitt