This reverts commit 3dd319ec. Sorry, I forgot to amend the author name and email when merging this patch.