Implement suggestions from !694 (comment 94482)
This will create a new commit in order to revert the existing changes.