This commit breaks badly the revision handling

Starting point for the upcoming changes