Revert bfe68c9..9503f4f

This rolls back to commit bfe68c9badad406c3aa54401e63d03782a9ffa1f.
Revert "Revert bfe68c9..9503f4f"

This reverts commit 299d27a6a99b42457d65a94987c9cf494c035dc0.
Revert 930416b..2fc52b4

This rolls back to commit 930416b82605231052cd5a9c0f72f812b941c120.