Fix for BZ-1068662.