Also adds a test to ensure that they stay that way. Change-Id: Ib34a81885f1eda28e85d04b727e8b810b274cb44