Merge branch 'revert-1ef8e04d' into 'master'

Revert "Merge branch 'issue/53' into 'master'"

See merge request !47
1 job for master in 52 seconds (queued for 9 seconds)
Status Job ID Name Coverage
  Test
passed #21493
node postgres
run_tests

00:00:52

97.06%