Revert "Handle race condition with loading events"

This reverts commit f8b01072c27439c6650b4b6f3905b3f4adee75f8.