Revert d4d48fb..8dad5a5

This rolls back to commit d4d48fb35f79c09faec29b57e560ababf0bd62ae.
Conflict resolution
Ignore file update
Conflict resolution-2