This turned out to cause problems, and was reverted on master together with its follow-up change in 66addf8e. This reverts commit 3a843031.