Add old functionality back which was removed in commit 589a42e2.