This was reverted on master in 3510197d, and so needs to be reverted here too. This reverts commit 3befba54, reversing changes made to 3655e7e1.
