Smoke rework caused endless loops, reverted.