Fix for BZ-1064223.