#271 aims to do this as well.