Details: - Reverted some changes that were unintentionally included in the previous commit (9526ce98). Thanks to Tony Kelman for pointing this out. (Note: a few select changes were not reverted.)
9526ce98