Patch by Noel. Committed and this message written by tml, who doesn't
fully understand what the code does, but this definitely fixes the
problem.

Change-Id: Ifdc9faac0323028fa2888eb4a2d68e6ae5a905ae