FIX: Revert errant fix