backed out SGF-172 - moved to feature branch 1.3.x