This reverts commit a0372e616c. This is causing more issues than I had hoped. That is: any at all.
a0372e616c