Revoked r10071 (Addition on r9889) (Accidentally committed to tags folder and the commit was already made in trunk)