Fixing inconsistencies caused by reverted commits.