Revert "Merge branch 'release-version1.0-20141218'"

This reverts commit c2cad7276e41e559e39aef28f7b55916613f5b54, reversing
changes made to d37f3a033b2932d0c8ba22ebb4e1f1090ad5fe11.