Revert 07bcf78..ad11027

This rolls back to commit 07bcf78eb7830a6c3f468a92dbedeeef278734e7.
Revert ad11027..40f0c51

This rolls back to commit ad11027513403dbaf011cfb078f715d32337cc05.
Revert "Revert ad11027..40f0c51"

This reverts commit 66b37c505d7a372f54483943fb820cdf3ef1dc2f.
Revert ad11027..b3e5b8e

This rolls back to commit ad11027513403dbaf011cfb078f715d32337cc05.