remove premature optimization for scaling apps [fixes #51122485 #51178431]