Revert bc10192..44879a7

This rolls back to commit bc10192ae3e55ac41ff1211b02ea62f26913ffce.