Revert f1027d3..d5c99ed

This rolls back to commit f1027d3377914867d80cb03a3490b964c453f40a.
testQQ