Revert. Seems to have destabilized the build This reverts commit 6dbb5a8052c5cbff9dfb9ebac68d3200d3543955.