Maybe this is our next MBB commit