This reverts commit 8f61c9c0. current implementation breaks about:preferences due to runtime errors
This reverts commit 9ac0abfd.