Revert "Merge remote-tracking branch 'pr1/patch-1' into development"

This reverts commit ac464eb22a73f304ed949549fb1baa39d08cd1da, reversing
changes made to 37eb238e3fea3ae51d8f08dd7f31a713665dcef1.