Revert 38b3b83..29aa06a

This rolls back to commit 38b3b835f0871e0a49dabc9348044b43e4cb5c55.
***1.2***