Added back refactoring made by Xu Rui in Actions.