Fix for LP 1123354.