last remaining users used it as a complicated way to do a simple thing

Change-Id: I810b1542b03bd6faa54f6f076b58cb7d3e680ab0