Revert "Fix commit 4ce059a69a9b25e7585623ecb56633e81a057450"

This reverts commit fdb416829f18b70d95e49a450e5f852e6c6ae605.