Need review for #3180 please

[Kean Johnston]

> Fine by me - we can always fix the monitor code later.
> 
> Are you going to be able to fix the modular xdm build to match
> by RC2 or would you like me to fix that?
If you could that would be great. I am having a lot of difficulty
with the modular tree, so although I am pretty certain I could
make teh fix "blind" I really prefer having it tested. Thank
you Alan.

Kean