Fixup for laggyness with CM10.1