Revert to non scalable