Remove temporary hack that shouldn't have been committed