Once again, revert to non-subpage system.