Merge "revert recent changes around system listener registrations" into nyc-dev