Revert "Merge commit 'c8ae455cc5fe67ceee90bb58a4039e43e4245519'"

This reverts commit d3c5808c8b5261065de35dd53994544ec05e0ba4, reversing
changes made to 263ab73cfcc90a73c1db8d38ad5c67f7533a7b4b.