Revert "Merge pull request #728 from runrevsebastien/bugfix-12365"

This reverts commit ddea54ad47f7d5d84004c5f7e4516dab0eef40db, reversing
changes made to ef55aaf2c4ee8667b9671615b8e201462e4b669b.
Revert "Merge pull request #753 from runrevfraser/bugfix-12241"

This reverts commit 049991adaf6271711440225e457bfd10a13fd5ad, reversing
changes made to ddea54ad47f7d5d84004c5f7e4516dab0eef40db.