Maximize a window on a Mac WITHOUT going into full screen mode

I rarely want to go into full screen mode on my Mac; Pretty much the only scenario is when I am watching a video or in a video conference. So it drives me crazy that the default click on the green maximize button now goes into full screen mode. Thankfully there is a workaround.

If you hold the option key down when clicking the maximize button, the window height will maximize. If you hold down shift and option, it will maximize the height and width. In both cases, the menu bar and dock remain on the screen.