This reverts commit cd381738a616d0de907c52de7c1f510c73a74f50. dstftw commented in #10854 that he thinks this is the wrong way to go.
This reverts commit cd381738a616d0de907c52de7c1f510c73a74f50. dstftw commented in #10854 that he thinks this is the wrong way to go.