Created by: tomprince
The last PR that was in our fork has been merged, so we can switch to an upstream version.