Revert ee1120f..5e307b0

This rolls back to commit ee1120f95eb655e31a2fd697b2a726f2b05cddcf.
Revert 325ccaa..ae897d0

This rolls back to commit 325ccaa78c21b08deb68bf253927546817cb9442.