Revert "Fix commit 4959f369d9bdcc"

This reverts commit d6d5f6803e7433c5b7bb75e982fa066be908af4a.