restore commit by laltu on 18th