Remove autoload
Merge branch 'bug-18369-do-not-autoload-persistence'