Revert eac6eb5..d0b2ab7

This rolls back to commit eac6eb51b253cf79c10a74115df25326bbefac0c.