This reverts commit fff16807c2. We no longer need this workaround after 053478bbd0.
fff16807c2
053478bbd0