This reverts commit f7a33090. Unfortunately this causes a number of failures that didn't show up in my local build.