Revert "Update to 2.4.7"

This reverts commit 47f2878ca39048bb29bf892ef358cc7b03fc2541.
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3