Apply our forked changes blindly - this won't work for anyone else at the moment