Revert "Merge commit 'feef9887e8f8eb6f64fc1b4552c02efb5755cdc1'"

This reverts commit ba0bd64d51c7fadbec28c4d769d98fee588b67d5, reversing
changes made to feef9887e8f8eb6f64fc1b4552c02efb5755cdc1.