Revert a part of r223583, for now. It seems causing different emission between stage2...