in an attempt to simplify even further

there is still at least one manufacturer who continues to produce the two-step version and I hope they never stop.