DON'T MERGE: breaks extensions