Also accidentally added back common overlay folder