Revert changes in patch for bug-883829

Revert the patch because the solution is incomplete.