Revert "Remove unneeded cfgs"

This reverts commit 10d4be1ab3d44864be6693c47a8895c7f229e314.