Revert the last couple commits again! We will be based on stable/9