Revert "remove worthless indirection"

This reverts commit ffe7f9c4ab9785e640a7f1676e11af8d5188b221.