Revert "Modified with 3.2-SNAPSHOT changes"

This reverts commit 2df0db4fd2d0838b132215b67a0d6ce4756e0568.