Back out r242262. The simplified window change/update logic wasn't complete and ready for production use. PR: kern/173309