Revert "ehmm"

This reverts commit 6c9b10b3d6f7570d20be3706a4dcfdc574ae2a86.
flatten