Undoing @marc's fix: Didn't actually fix anything