Revert "Merge branch 'safin/f1215-time-issue' into rc3.0.8"

This reverts commit 9e7563fbbe15a765034e8ffe4085fab640bcf78d, reversing
changes made to 009898f4ec3173b9b88f26377370638938f319da.