Bug 906706, 906656, 895639: revert; a=bustage

Possible one of these commits is causing a puppetmaster to OOM.