text removed.

dropped that.
Merge branch 'the-conflict'
Revert 0f2db27..cf9cbfe

This rolls back to commit 0f2db270b5b705a9892ea30e28567e262ca0a27c.