Revert "Fix Bug 964580"

This reverts commit 087d2538ed8ad5231656299ac604e4a37fa2a789.