Revert 70f8d94..bbbe395

This rolls back to commit 70f8d948d3aeeaca2d3654abfc10d96c744c40a5.