Backed out changeset 9fea506e48ab

Sam beat me to this on a different branch, apparently.