...but not at the cost of breaking it for 0.7.2