Revert 234d4b2..daabfcb

This rolls back to commit 234d4b251a3ac6e5a140b893195ae796209945e5.
Revert "Revert 234d4b2..daabfcb"

This reverts commit bb5d6ac9446390dd0db7b7e4a33e8b0d6b3adf04.