Revert all APE_25_OPP Commits