The previous separated-out configuration wasn't helping us, and this makes it easier to make the extra installed applications pluggable in the following commits.
Tim Abbott