This reverts commit 0cf5e0846d. Unfortunately this commit leaked in from an older branch where this change is needed.
0cf5e0846d