Reverted: http://crrev.com/c/7099340