Removed last bits of "disable HW overlay" commit