Bug 910647 

This reverts commit fb09a898b46da1507fa4339eba5d0cf8b8f4caf4.