Undo fix for #12 that relates to #14 (rollback 7f65a3295b68fea4da143b502bfe0b9b941bd4b5)