Reapply r194218 with fix: