Can we get a darn commit to ease the pain?