Revert 134f4b8..800001c

This rolls back to commit 134f4b89c98f9d1d55be5a71638c226d3f8cd58d.
[20131228_kaifer_v42]삽질