Revert "Merge branch 'pr/323' into develop"

This reverts commit 2209f916ff825acd681a0e79ac39725bd33c7560, reversing
changes made to e835ee31d192a084e6a173176345f5af02ab148b.