putting back some cms 5.1 stuff until AHP is fixed