Pre-schooler returns to class after long-locks debate