0a386b9234
This reverts commit 59e733ca81b707780901340686ecd7419077eb54. Hold off removing arnr_type to give users the opportunity to change their script files to handle its deprecation. A follow-up patch will mark the control for setting arnr_type as deprecated and it will be removed completely in a later revision of the code. Change-Id: I8b817c744e144d3714234a4cd4309816d0c7e3e8