Fix bug observed at test-time, caused by new way of injecting EMF.