Simplify recreation of gh-1054