About two years ago, INS once intended to stop the above policy. They mentioned that they would published a policy that allows a 485 applicant who working on H1 work authorization and used their AP to select between H1 and AOS a status to which he/she would like to stick. Such a policy is never materialized for whatever reasons. It is generally believed that if in the future CIS decides to reverse the current policy people should have time to decide beforehand.
Last time on this topic.