revert changes unrelated to page-extensions