Revert "Fix DevelopmentPreference issue"

This reverts commit 27881a0c28438db043e4f9e18f5fedfb69e1bcbe.