Revert "Merge branch 'pr/2801'"

This reverts commit ea304a00efd5aa5837ab74979b60a1597d4eb82d, reversing
changes made to b9a0cb902a8a77635d1c0fba99a5a4ebad8197c1.