Revert 1e46dbd..ad3bc0b

This rolls back to commit 1e46dbdbe9f1e3ef6c875c5b711d8b8211f2f9dd.
Revert "Revert 1e46dbd..ad3bc0b"

This reverts commit 1184a5680a782fe30308a9ac93f62eb5f8d7055b.