This reverts commit b556decf75b2b084e1aed54ac7fa23a141eedb7f. This is no longer needed as the SimpleDateFormat has been switched in the framework. Also, the revert leaves the change to intellij inspection profiles as is, because that change was independent of the main issue. Change-Id: I6f4d7d9ddc10262b087ad6a2604fa50562fac043