Revert 70c91e8..640568c

This rolls back to commit 70c91e86c29eca343b001e685b3dbab36ddf46db.
Revert 20568fd..c0cd4ae

This rolls back to commit 20568fda47c99235ed13e300fa4e1bd74b8c281f.