So far this MR only has a (failing) test in it that demonstrates the bug.
This will create a new commit in order to revert the existing changes.