Restore LPS-44739 Revert code that uses offending method
LPS-44739 Update the listener to the new SyncronousMailExecutionTestListener