Class layout change. Broken.