Duplicate security stopgap from Core