Remove temp fix

closes #1912