Revert r32473 and r32620 for now since those patches need to be updated for dconf 0.12
Changed paths: