No point in hidding something useful like this in some helper lib.

Change-Id: I7332d7f6bd428378cd19e7e95ad130771a541140