Revert 11c3189..8603f40

This rolls back to commit 11c318964e3d9b8204dba325d90ce8c7d48635fa.