Fixing regression by rolling back 04232c.