Revert part of r20493. Created bug 1229 to keep track of the issue.