Revert "bugtracker id 0000076"

This reverts commit 0fbb79a5b2a65c18f5935376e9c224dfa1a5efb0.