Revert "Merge branch 'RayBranch'"

This reverts commit be3c1835a8e25f102461a2feffc0dc34f93b6276, reversing
changes made to bf354506b2017698815a7119b2f4cf1fe9ed14c1.