Revert and fix  "Start counting break time when break really starts"
Revert and fix  "Start counting break time when break really starts"

This reverts commit 0db248b56d5360a3f8f0475c3f18373b3d3e32cf.

hovancik/stretchly,hovancik/stretchly,hovancik/stretchly