temporary commit from bug 967440, remove once bug lands