Properly fix commit 4ce059a69a9b25e7585623ecb56633e81a057450