Revert 2ad4c22..c5e007f

This rolls back to commit 2ad4c22b3010a296d078b8ed3818d61ce6ce8275.