Going back to 1.6
(cherry picked from commit ea4e8c9029a95b984d283f3a603c55f5061be1a3)