Reverted 0c6ca7f44, to avoid extra dependencies.