This reverts commit ff640f197a. Original patch reverted as Author's name was incorrectly set.
ff640f197a