revert magic smoke till it is fixed