Revert "Keep Dev options inline with new switches"-i be smarter den dat

This reverts commit 8a8dd0baee6b5da463f0543f27a8ffc62c3f234e.