Revert 68b4614..2dc1a21

This rolls back to commit 68b4614b5ea04a37f0a8feef0994c2d10dd9938e.
create and leverage common method for localizing labels