I will remove the explicit version for spring-context when merging.