Revert ef59423..7ab7b3d

This rolls back to commit ef5942322abaccc3e990a2cd901ef1cc27bbcd35.
Revert 7ab7b3d..af45776

This rolls back to commit 7ab7b3d6fc3113073737337166330f10ffecd7f4.
Revert ef59423..f3684df

This rolls back to commit ef5942322abaccc3e990a2cd901ef1cc27bbcd35.