Revert abef57a..1b571f2

This rolls back to commit abef57a1f6c7c6352c3f0d53db2106f1117f84bf.
6－10－2014