Revert 0d1ac32..c327500

This rolls back to commit 0d1ac32e06ceb847f82f2b656de6e6bd0f095b60.
1.3.2backup