Revert "Merge branch 'static-pages'"

This reverts commit dac83907a9224cdc11ad05706e8646ce61fe7264, reversing
changes made to 7464c71e49af6c82bd5056d95d99cd6b2d884039.