Reverting. It seems to have destabilized the build. This reverts commit aaaa813225fa071ae84044cc18041fcc10700ace.