Revert "Merge branch 'stasolution'"

This reverts commit d9dbbde38f940e7ff918daf41a64ad758c956147, reversing
changes made to 4c442eacd566c98e87a6ce18a23f58cf2d42a603.