Fixed what looks like a bad merge

Fixed some code that should have been in `2.0.4` but was not there for some reason.