Replaced by an RRO This reverts commit 273de226b9. Change-Id: I00a6db6ff86008296b9fa081268c5dfa30b2f7c1
273de226b9