Import reverted changes from branch fix_problem.