Merge reason: we want to queue up a dependent fix.
Signed-off-by: NIngo Molnar <mingo@elte.hu>