DO NOT MERGE: to be folded into 25a5d0 once TODO is resolved.