Chris Sherlock says that should make it possible to get it to actually
run. (Didn't work for me, though.)

Change-Id: I69a7badaf1f19481546866cfa2a417029c305105