Bug 842230 - Use the value stored instead of a default value