As in upstream commit bf131e8d2181b3404f5293546ed390999f760404
@jpetrell @adenexter
This will create a new commit in order to revert the existing changes.