Rolling back Suggested change by @aogilvie to conform JS Api instead of native