This is version from F20 and I would rather like to update it here than relying on fact that folks will not break master :-)