This bug was never shipped in a release, it only existed in master and
thus is not a change from the previous release.

This reverts commit 67514193.