Revert "Temporary change for 5.5.5"

This reverts commit e942c6d91c68a7187d49d321fb8d4b8056579a3a.