IDE-1322 rollback changes now with upgrade sapphire fix