Revert "150920142148"

This reverts commit 80b6bc1e7eedf2793eec66a97a7bbd2ee1c8d4b5.