This modification is one of the preliminary steps to the full plugin extraction later (see JIRA above). Basically reverts a8c3a031.