Un-deprecate constructor. Rearrange method arguments to match parameter significance. Reformat code, replace space indents with tabs. Original pull request: #2403.
Un-deprecate constructor. Rearrange method arguments to match parameter significance. Reformat code, replace space indents with tabs. Original pull request: #2403.