Reverted separation due to changes in make targets.