Revert "Temporary change for 5.5.5"

This reverts commit 78d064c4e0dd709f5a73c55a53640cbffbd93e55.