refs #16: Back to the way it was.