This reverts commit a2110bd3fc. There's nothing inherently wrong with it, but upcoming commits will apply similar fixes in a slightly different way.
a2110bd3fc