revert r178784 since it does not have a commit message