This works around a compiler bug, and is probably more correct anyway. Change-Id: I1c49064bd64c31dafae560e416c665de0449f245
768d9e1a