Bring back split configs

This isn't gonna work... The blackscreen bug on the p505/6 is unbearable

Change-Id: I67a27978d773d4e6a46c22b67ede0590a86a0371