Revert db707cd..c43a765

This rolls back to commit db707cd54597b9725a195e468e6b65ad7ec2a03a.