Revert "Merge commit '77368bb'"

This reverts commit 3088e20a0be19ead99b6a5032583be2b3a32f266, reversing
changes made to dc6c71ebb5029e3be07a5179ec40fc01a34c5f9f.