Pete, I have inadvertently pushed the proposed patch that enables your #if-0'd block of code. That affects only RHEV-M, so wasn't exercised by my testing. Say the word and I'll be happy to revert that change.