Reopening to fix in a future release since this change was reverted via the last commit to bug 1420900.
Reopening to fix in a future release since this change
was reverted via the last commit to bug 1420900.