Revert "genplan"

This reverts commit 1d8848f2f44bf7c02081ae34c508769aed9d95c2.
Revert "Revert "genplan""

This reverts commit e3247166271c68fc5b1e67f98fa41e232581cd1e.