Revert "Revert "Stepan""

This reverts commit 27a7086d39494047fec0737217382e6955c2678b.