reverting invalid merge on trunk-gd