Revert fix
Revert "Revert fix"

This reverts commit 771eb1bc51e3fbc5e6d66fcc82e8bc7425a1abea.