reverting commits b9e1929c5e8b0269eef89c0c4feaa1bbb8712f58 and 078138b30daa90abfea2e7eb7538aed987e9e7e1 

Reverting commits regarding unsafe treatment of EventSetup