revereted a change which caused a bug