Bug# 889957: part 1