Reverted to using runtime dependency