Removed the recently added user scalable thing, oops
Merge branch 'develop' into staging