Revert "Revert 972a202ce8bf1a3b133f04ee68c71adec23b4b6a"

This reverts commit 9fe8db3f99267e489e9340f69b7882b34133c818.