Backed out changeset 694322457a64 (bug 860867) because the clang bug which required this workaround has been fixed