back out OS-3215: causes OS-3223