Merge "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."