Fix monitor problem when rejecting with undefined
Revert d539709 which created incompatibilities in the monitoring APIs. Will re-evaluate for 3.x
Merge dev, which reverts d539709
Remove 2 unnecessary casts
Remove duplicate timer sniff, use lib/timer instead