WINTERMUTE: Revert spurious changes in 2a3963