Date/time EP removal changes for Android