Revert r301831 -- I forgot to add the diff from Phabricator

Pointyhat to: ngie (never commit without svn status half asleep)