Revert "switch to the first solution"

This reverts commit c6a90e7b4efc94996ea17d86b1875a3545539437.
ranges added