Revert "Merged settime onto master"

This reverts commit faf3d241a072ecc46dfc1d055b9caa94f1d14d73.
Revert "Merge settime onto master"

This reverts commit 89e644f3edffccec51552aa5b1e894311e0dfb23, reversing
changes made to f9b74edda4ebe4300b36ac4a70eec862a7ccb405.