Revert some earlier changes to QuadsLayer