Are these inreplaces something that should be addressed by upstream? Put another way, will they be required for the next stable release also?