Revert "Revert e589ee4..2eccc25"

This reverts commit 161e1cc5ccc4658a154bb06288643e15c610e3db.