Revert incorrect file merge from 3.5.
1 file changed