Revert "Revert da2adb3..352aede"

This reverts commit 5e988d10c409f7d36c52f2c42fe46e0b28eaf694.