reverted to before suppressEvents as it may conflict with future history support