in two methods — worse solution
Revert "in two methods — worse solution"

This reverts commit 955adedb37e76de69b88ee9ad6cd9fa3d08f69de.