...Same as previous commit, only smarter.