Revert "Merge branch 'issue432' into 'master'"

This reverts merge request !457
2 jobs for revert-11397b25 in 5 minutes and 7 seconds (queued for 21 seconds)
Status Job ID Name Coverage
  Test
passed #147138
Lint

00:01:36

passed #147139
Test

00:03:30