Revert "includes from 2.5.5"

This reverts commit caa9c8bbc4bdccfbfe1d44ddfe4ccfc183f4e63b.