Revert "Temporary change for 5.5.5"

This reverts commit 7cbbc62b5cdcc0aabe0cefc5be5c9c194f27dd20.