Revert "Revert e0cdde7ff7b0e867225049550b3efbf9fe10f5b1 manually"

This reverts commit 79bb1184863fe6c576cd3bd84e07a1641afb5538.