Revert "Merge branch 'chris-branch'"

This reverts commit 7db236fd26d5244ded440f710d3280a4a8d77d03, reversing
changes made to 7f7196597990ab2bab23af8cee88f153592324a5.
Revert 7db236f..6092812

This rolls back to commit 7db236fd26d5244ded440f710d3280a4a8d77d03.
fixed old pages