Revert uncommenting of course attribute setting