Avoid a replace

 * Maybe an improvement on 37fbccb41dc0160af2232da727fbb898a1920205.

 * Sorry, this should have been mentioned in review :(

Change-Id: Ie98d62d122c363b043b67baee53d7a664ba30a03
Merge "Avoid a replace"