Changes property setter to use return value instead of context