Rolled back some experimental features
Rolled in a few bug fixes and unregistered event handlers before
registering new ones.