I will reimplement this correctly later - it conflicts with the CL with API changes and the deadline is tomorrow and I would like to avoid staying until midnight again.

Change-Id: I1ec11eee2bfbca5e833140136ca22768130c6c43
3 files changed