See my proposal: 9c064f9958c045404ae19aac89cda3bb4a6451ae