Reverted Matrix4 makeTranslate/makeScale change. As suggested by @WestLangley in #2780.