Reverting various checkins related to this bug.
PLUS... proper 1 line fix included (merged from STABLE19)