Revert "Merge 12/10/14 with Battle map key controls"

This reverts commit 23ca6994a6d7b81bdecc51992b2b105bd18b6b22, reversing
changes made to f0a6c5dbb5604e3b64dfae5779e3ac7fd9ddd1ff.