Reinstate old patch-based API.
Review.