Breaking change, anyway we can make this backwards?