Revert "Move overlay stuff to common"

This reverts commit d7e6de2e77384e69df7c24076a9f27c82ae61f09.