Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0a