Revert "Revert previous commit"

This reverts commit 8b39aba67824ec92ed541d218cfff1d39e804a32.