Issue #3269016 by swentel, tonytheferg: Layout builder creates a bunch of extra block field selections