Revert "20141217"

This reverts commit c40f233e001a2c7d5268e333f52c028498d9d011.
Revert "Revert "20141217""

This reverts commit f436ff844414972d9e2ad5aea159aca94e33cb36.