This reverts commit 12e479475a. I accidentally landed this patch with the wrong commit message ...
12e479475a