Fix for the underlying issue behind bug 924651

[merge]