I was trying to avoid always creating new scalar here. It's likely that majority of these will be noops, that's why this took ownership and returned it back
Originally posted by @robert3005 in #6309 (comment)
I should investigate if this change was necessary