Revert "Fixed errors in 2.5"

This reverts commit b544067d4766efcb0ce6d8a8d07a31c4a069e388.