Backing out fix for RT11913 after discussion with Tom