revert macOS upgrade changes
This reverts commits e0106e95 and 245bb527 (MRs !3533 (merged) and !3489 (closed), respectively). These changes cause problems for Macports.
Gitlab: #2519 (closed), #2520 (closed), !3489 (closed), !3533 (merged)
Reported-by: @ryandesign
Suggested-by: @zosmac