merge from 1.8 branch (removing this file)