Description

Reverting #4917 for now until more test cases can be covered. I've identified some issues that need to be addressed and put into automated test coverage before full roll out.

Type of change

• Bug fix (non-breaking change which fixes an issue)

Testing

This is how it worked before

Checklist

• I have tested my changes
• I have performed a self-review of my code. Ensuring variables, functions and methods are named in a human-readable way, comments are added only where naming of variables, functions and methods can't give enough context.
• I own the changes of my code and take responsibility for the potential issues that occur