Merge "Partially revert BUILD_DATETIME change"