Two heavily cargo-culted commits