Revert "Also add when substract minutes/hour"

This reverts commit 00794d1f15a522e5793a48e21bc38d724f6fb90d.