Revert LWAR window design to before "Fixes"

at @deavmi's request