Revert "Refactor .remap and use option as shift"

This reverts commit 2a0d87fe6954340fc91e464698b73d728b23e461.

Conflicts:
	.remap.rb