[AMOS commit] MDL-32009 reverting changes as they break installation Committed into Git: 2012-04-04 02:37 UTC