This reverts commit 4afca0647e. Reason for revert: ROCr query should now be usable in upcoming release. Change-Id: I2207761ca6af5d585d090bae1af09eb9a8e9bad6
4afca0647e