reverted r49889 - breaks patrol mark functions (and a real fix was used anyway)