Fixing regression due to the new flag for disabling parent events