Revert "fixing number scaling and int(1) handling"

This reverts commit 0ace04fe079c84e0ce801063b2ff8749d8270ce2.