Revert "Merge remote-tracking branch 'origin/pr/486' into develop"

This reverts commit 1f6a7d1336d73b345cace078446f231e27a5ac45, reversing
changes made to c6b1b1f6d028d417f1690ea23b295ef922157483.