Revert 4019064..b0ad5fe

This rolls back to commit 40190645f3ec734f3a3e2e0aef8eff4f01ace9ac.
10－10－2014 17:36