Revert "Get proper values"

This reverts commit 399315aba1b7f9a842afd908588f717e97aa4f7f.