Revert some rectangle changes that don't work on windows