Reverted overlay to class
Reverted overlay back to class