Adds code back in that was accidentally removed in previous comits
Created by: dbolson
Not sure what happened, but these changes were previously merged and then disappeared.
Created by: dbolson
Not sure what happened, but these changes were previously merged and then disappeared.