Drat, knew this would happen again some day. Undoing part of previous commit.