Revert 25b27b0..d1eaa39

This rolls back to commit 25b27b06d907b77cec3351e265c07cc8a69519fa.
Revert 138aec8..1013688

This rolls back to commit 138aec8939ba854134fb9d18a94451d3d65c1074.