Readded stuff losts in commits