Fixes #20200630-BB32 and #20200630-48F9FA
This will create a new commit in order to revert the existing changes.