Revert "Now that overlays are  back here: Correct call to overlays"

This reverts commit f854b66ab3face5ca6cccbb2e3bee0cd65822e15.

Change-Id: I94bb40ac0281aec37d2b1b8f7cb0b9c36bd64c18