Revert "Replaced overlay target package"

This reverts commit ae885416dddd684fab2369fde234dc9e48db5051.
5 files changed