Restoring backwards-compatibility

Based on comments from @kmike

Also added extra comments for clarity