Recommit some changes that are were reverted last patch