Reverting issue 39 merge.