Revert "Initial commit of G1.9 changes"

This reverts commit 88bdbb8dc45eca3d245fd1cf4e4853850b750dc4.