* revert jfernandez patch