Seems unused now; revert?