Revert the OS events feature.

#4284