Flatten harder

Change-Id: Ib31e1b2e469a87e88b62852b1de8027e72c37841