This reverts commit afa192cf. This can cause an infinite loop as shown with an example in the post-commit thread.