Revert 165057, per Jim's request. This requires further discussion.