Apply 8e4fc5e, will cont.