Reverting r220435. Jim Ingham and I discussed this for a bit, and we came up with a better command model for this feature