The PR wasn't good enough yet. This reverts commit b2a37ceeea, reversing changes made to 7fa9a1abce.
b2a37ceeea
7fa9a1abce