Observables workaround is no longer necessary