Swapped back

Manually swapped back to previous working code, instead of reverting.
Fresh download from Production

Before making any changes.