revert r1531202,1530845 since svn merge has difficulty

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_5@1531454 13f79535-47bb-0310-9956-ffa450edef68