Older version of Pre-pinned bug 2522

Malcolm Tattersall