Reverted last commit. There's a better way.