Revert 5a5a5d1..b43d0cb

This rolls back to commit 5a5a5d1024c2a78b5a6bc9e0891ff1de6eac9de1.
Revert b43d0cb..53beaa0

This rolls back to commit b43d0cba5c403f74abf517969fadf6c847a505ba.
Removed file conflict markers