Revert "07152014"

This reverts commit 937ed8359d5e64392a7036f576a9122fd0aed544.