Comment out termination detection code for now. Doesn't play nice with MC