Revert "[#88][#66][#76]CE 3.5+ Compatibility"

This reverts commit ec7d9b6649a13044074f795d9af8be0893fe62b8.