Revert busy loop fix.

Note reason. Need to fix this later...