Revert "merge rsolved"

This reverts commit a212528b9dfbd71c4debdbf9e7abe3c851eddb8b, reversing
changes made to 64345765d1a48b258baab4eb05977c17106a6ce9.