We should make a decision on whether this is needed or not before merging the Pull Request.