Can the Close / Minimize / Maximize buttons be pulled out of the Global App Menu when a window is maximized?

I've disabled the Unity Global AppMenu as it personally drives me batty - I've also moved my minimize / maximize buttons back to the right hand side of the windows where I like them.

However, when I maximize a window, the minimize / maximize / close buttons get pushed into the top panel on the left, next to where the Global AppMenu would be if I hadn't disabled it.

I would prefer if maximizing a window functioned exactly the same as if I pressed Ctrl+Alt+Num 5

Is this possible?

No, this is hard coded into unity, but if we push really hard, we might be able to get them to change it for 11.10 (file a bug, or mark an existing bug for it as affecting you).