Replace upstream stupidity
