This reverts commit 8f690ec7ffd8d435a0212a191634b544b0741c4f because it caused errors in collecting coverage.