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

This reverts commit b83e777b90126bdb520df1024bf2b042882600f5.

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