Revert "Revert 04457d8..e246c52"

This reverts commit c695b5becc22d1b5eb7691344a5580917405b50a.