Revert c4fb00f..4b2c36b

This rolls back to commit c4fb00f59ed79d06ff768f2ede5e59e1ebcd1c01.
Better fix for the data update