rollback previous fixes to make merging easier