Revert SVN #38954; Correct fix to follow.