Revert to old attendance block for 2.4 #5