Revert d9a3e20..1a5b572

This rolls back to commit d9a3e204190bd12a195b7c9162c3e478231390ab.