Revert "BZ-1022140: removing busy wait loop from fireUntilHalt() - apply required changes"

This reverts commit cf1f112b64de4ff5ec9114dba7ec94cf5f0720c9.

Cleaning up the code in core, so these changes are no longer necessary.