Revert e6b0c8b..3604e6d

This rolls back to commit e6b0c8b6b57e1e3bd95518c238a24ef16fb262da.
Revert "Revert e6b0c8b..3604e6d"

This reverts commit 6371429fe431c1e807fab1918aa5925c2f49f980.