Revert "Revert eeb6c3e..a604d98"

This reverts commit 5527c97c8990d11de4178a4b4abeeeba234575d7.