Revert d539709 which created incompatibilities in the monitoring APIs. Will re-evaluate for 3.x