Reviewed by Darin, landed by Maciej.