Fix for BZ-1090399.