revert fix for WP8
created Common module