various regression tests for the issues that prompted its inclusion all now
pass in its absence

Change-Id: Ia375322335b4272aa6c3d626b2d98bc64465bf1c