Revert some layer changes I made to the window.c file.