Shouldn't this be moved outside lib/base now?