Revert d5cba49..a3f123c

This rolls back to commit d5cba493a017515bbae402e00417ae6b8af510a6.
modified unnecessary call to map