Revert "Temporary change for 5.5.5"

This reverts commit 5f4c96c3c37b5c076e115213228bbb1d87ec64c4.