This is now set unconditionally - should lines 17-19 still be here?