Remove unnecessary topic fix for Yosemite

A better solution to the problem has been found and the Yosemite topic fix changes are no longer necessary.