I20150914-1130
This reverts commit d25f7984032ffe205cd9602415e0dee2ae8fee71. This reverts commit 2322b07a7b8cd0178edfb09393c7510900d87b43. This reverts commit 02799438b87d838a30f3cfcfb2e91fa38d7825ce. This reverts commit 278268fcbe218fbecadf2bf23114c3990e80c9d9.