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