Revert "overlay changes for qcril"

This reverts commit fa3235aaa8e12c61b46364d6b769c32f5fc7c953.