Revert "Scaling probelm"

This reverts commit 311891b80dc7e070e319cd2dd64ae90c5bcf5927.

Commit needs to go through pull request first.