Revert "4.0.56 Accidentally included bad changes in last commit which were thankfully not included in version sent to collection team. undid those changes"

This reverts commit ad378366761f1052d0a7dba719a35e285d923fba.