Let's get this re-enabled if at all possible before merging this PR.