Revert change of remove and push order done in b2a1aa1