Revert "commit"

This reverts commit f7918232c4374bfba8601812e232a2ecf6e2f306, reversing
changes made to 5123731224e037544360343f61381b8310d754ec.