Revert "20140917"

This reverts commit c018efdb5dda56fb0435e928585a1334f95fcde6.