S-anasol oops revert recommendations

Latest commit f15b67d

Jun 7, 2018