Revert 660330e..47d2a99

This rolls back to commit 660330e7e9eac6c456a6573427a7ebee461d08fb.
interim checkin...