Temporary downgrade to 1.7.2