Revert "Get proper values"

This reverts commit 59b48ba59ed1864f301b7a4cf559998c5ebc49db.