temporarily use both scaling properties until new code is deployed

Change-Id: I27415129d4d69c6fba5cde6eb1244449ac9983e0