Skyscraper near Grenfell site goes back to drawing board over fire safety fears