The commented-out decorators could probably be removed rather than uncommented - I think this issue is fixed now!  Same below.