Revert "test hacks"

This reverts commit 5040961d2eba571174b445d2a5b328b7491e09d9.
Revert "Revert "test hacks""

This reverts commit dece7629311800e25b79008cdde18b4afdb7db63.
clean up