#44 Restore import that got lost in merge