Revert "Improvement"

This reverts commit cfa1323073697c34a7fac33b8eefab483a525594.