Revert f15d51a..00be05c

This rolls back to commit f15d51a8a7236dfed9e485ce50c44f0c6bbf237a.
Revert 2d49af9..67f7060

This rolls back to commit 2d49af928be9f23bf03c07c93ae0a39235a2b5dc.