Applying fix for Bug 1204314