Revert "Changes to support V1.6"

This reverts commit f6d87ae05d29ba74c6cc7ccf71c59418722d4605.