Older version of Pre-pinned bug 2519

Malcolm Tattersall