Revert "2.03.0:zeress:13 Issue #49 Partial Fix Pt. 4"

This reverts commit 9de21ba5376e187c5cad259430efb82de0240e1d.
Revert "2.03.0:zeress:12 Issue #49 Partial Fix Pt. 3"

This reverts commit dcf54fe6b9e875c578df66884ba47e8d8db9a916.
Revert "2.03.0:zeress:11 Issue #49 Partial Fix Pt. 2"

This reverts commit 877a90e451f6da4dc7f39cce37b006c2100187a5.