Reverted changes made to individual settings pages in favor of fixing the core problem.