Revert "Merge branch 'static-pages'"

This reverts commit dafe2b6ad00be9edc48bfd70688d7f6b0e410e13, reversing
changes made to b4fad06ba6aa4ce79ed7ee26044da41aba623a89.