Re: Review Request 1567: Fix RHBZ#1082019 and clean up