Revert "Change to original checkboxPreference"

This reverts commit 4518bf12983c1cd742f1eb63e1bc505e3121d346.