This reverts commit 54c136e6. It was submitted without an appropriate patch description. Will reapply shortly.