Addendum to #2e58429 to retain the key = true behavior.