Revert "Small 4.4 fixes"

This reverts commit 5c92fe0ee38faf865443bbcdd6a881ff9bb4a874.