Revert "CI update against v1_7_R3"

This reverts commit f66d6d85c4f945dabd5ca0b6cd636603a0dfa507.